merge trunk
authorKenichi Handa <handa@etlken>
Mon, 26 Apr 2010 01:22:02 +0000 (10:22 +0900)
committerKenichi Handa <handa@etlken>
Mon, 26 Apr 2010 01:22:02 +0000 (10:22 +0900)

Trivial merge